x11: Fix build without Xinput
authorBenjamin Otte <otte@redhat.com>
Fri, 11 Feb 2011 22:19:25 +0000 (23:19 +0100)
committerBenjamin Otte <otte@redhat.com>
Fri, 11 Feb 2011 22:21:11 +0000 (23:21 +0100)
Missing ifdefs

gdk/x11/gdkprivate-x11.h

index e70846419f9cd552cfc7f902fec221d15e348797..5a60f8880d250f9de7dc852d073b68113367ce01 100644 (file)
 
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
+#ifdef XINPUT_XFREE
 #include <X11/extensions/XInput.h>
+#endif
+#ifdef XINPUT_XI2
 #include <X11/extensions/XInput2.h>
+#endif
 
 #include <cairo-xlib.h>
 
@@ -225,6 +229,7 @@ void _gdk_x11_device_check_extension_events   (GdkDevice  *device);
 
 GdkDeviceManager *_gdk_x11_device_manager_new (GdkDisplay *display);
 
+#ifdef XINPUT_XFREE
 void _gdk_x11_device_xi_update_window_info (GdkWindow *window);
 
 void _gdk_x11_device_xi_update_axes        (GdkDevice *device,
@@ -237,12 +242,15 @@ void _gdk_x11_device_xi_translate_axes     (GdkDevice *device,
                                             gdouble   *axes,
                                             gdouble   *x,
                                             gdouble   *y);
+#endif
 
+#ifdef XINPUT_XI2
 guchar * _gdk_x11_device_xi2_translate_event_mask (GdkEventMask     event_mask,
                                                    gint            *len);
 guint    _gdk_x11_device_xi2_translate_state      (XIModifierState *mods_state,
                                                    XIButtonState   *buttons_state,
                                                    XIGroupState    *group_state);
+#endif
 
 void     _gdk_x11_event_translate_keyboard_string (GdkEventKey *event);